@@ -109,16 +109,19 @@ public class App extends Application{ |
||
109 | 109 |
} |
110 | 110 |
|
111 | 111 |
private void checkCameraLibs(){ |
112 |
- if(Preferences.getInstance().isCameraLibExist()){ |
|
113 |
- return ; |
|
114 |
- } |
|
115 | 112 |
String tmpLibDirPath = "/mnt/sdcard/lensman"; |
116 | 113 |
File file = new File(tmpLibDirPath); |
117 | 114 |
file.mkdirs(); |
118 |
- copyRawLibToSdcard(tmpLibDirPath); |
|
119 | 115 |
final String unzipPath = tmpLibDirPath+File.separator+"so"; |
120 |
- new File(unzipPath).mkdirs(); |
|
121 |
- new FileUnzipTask(tmpLibDirPath + File.separator + "camera.so", unzipPath, new FileUnzipTask.FileUnzipListener() { |
|
116 |
+ String rawSoFilePath = tmpLibDirPath + File.separator + "camera.so"; |
|
117 |
+ deleteDir(new File(unzipPath)); |
|
118 |
+ new File(rawSoFilePath).delete(); |
|
119 |
+ if(Preferences.getInstance().isCameraLibExist()){ |
|
120 |
+ return ; |
|
121 |
+ } |
|
122 |
+ copyRawLibToSdcard(tmpLibDirPath); |
|
123 |
+ |
|
124 |
+ new FileUnzipTask(rawSoFilePath, unzipPath, new FileUnzipTask.FileUnzipListener() { |
|
122 | 125 |
@Override |
123 | 126 |
public void onUnzipSuccess(String zipFilePath, String unZipDir) { |
124 | 127 |
LogHelper.d("czy","onUnzipSuccess"); |
@@ -173,10 +176,13 @@ public class App extends Application{ |
||
173 | 176 |
if (os != null) { |
174 | 177 |
os.close(); |
175 | 178 |
} |
176 |
- process.destroy(); |
|
177 | 179 |
new File(zipFilePath).delete(); |
178 | 180 |
deleteDir(new File(unZipDir)); |
181 |
+ if(process!=null){ |
|
182 |
+ process.destroy(); |
|
183 |
+ } |
|
179 | 184 |
} catch (Exception e) { |
185 |
+ LogHelper.d("czy","error occurs -->"+e); |
|
180 | 186 |
} |
181 | 187 |
} |
182 | 188 |
} |
@@ -61,7 +61,7 @@ public class OrderDealService extends Service implements Handler.Callback{ |
||
61 | 61 |
|
62 | 62 |
@Override |
63 | 63 |
protected boolean parseResponse(String response) { |
64 |
- LogHelper.d(TAG, "startQuery 查询是否有新订单 = " + response); |
|
64 |
+// LogHelper.d(TAG, "startQuery 查询是否有新订单 = " + response); |
|
65 | 65 |
try { |
66 | 66 |
JSONObject json = new JSONObject(response); |
67 | 67 |
int status = json.getInt("status"); |
@@ -100,7 +100,7 @@ public class OrderDealService extends Service implements Handler.Callback{ |
||
100 | 100 |
LogHelper.d(TAG,"有新的订单"); |
101 | 101 |
}else{ |
102 | 102 |
listener.onOrderCompleted(); |
103 |
- LogHelper.d(TAG,"当前没有新订单"); |
|
103 |
+// LogHelper.d(TAG,"当前没有新订单"); |
|
104 | 104 |
} |
105 | 105 |
} |
106 | 106 |
dealOrder(); |
@@ -122,7 +122,7 @@ public class OrderDealService extends Service implements Handler.Callback{ |
||
122 | 122 |
LogHelper.d(TAG,"当前有未处理的订单" +orderBean); |
123 | 123 |
uploadOrigin(orderBean); |
124 | 124 |
} else { |
125 |
- LogHelper.d(TAG,"当前没有订单,10s后再次查询"); |
|
125 |
+// LogHelper.d(TAG,"当前没有订单,10s后再次查询"); |
|
126 | 126 |
handler.removeMessages(MSG_QUERY_ORDER); |
127 | 127 |
handler.sendEmptyMessageDelayed(MSG_QUERY_ORDER,10000); |
128 | 128 |
} |
@@ -53,12 +53,12 @@ public class UploadService extends Service implements UploadTask.OnPhotoUploadLi |
||
53 | 53 |
LogHelper.d(TAG,"当前有图片正在上传"+currentPhoto); |
54 | 54 |
return; |
55 | 55 |
} |
56 |
- LogHelper.d(TAG,"查询是否有可以上传的照片,时间="+System.currentTimeMillis()); |
|
56 |
+// LogHelper.d(TAG,"查询是否有可以上传的照片,时间="+System.currentTimeMillis()); |
|
57 | 57 |
currentPhoto = DBService.getInstance().getNextUploadPhoto(); |
58 | 58 |
if(currentPhoto==null){ |
59 | 59 |
handler.removeMessages(MSG_TRY_UPLOAD); |
60 | 60 |
handler.sendEmptyMessageDelayed(MSG_TRY_UPLOAD,2000); |
61 |
- LogHelper.d(TAG,"本地图片已全部上传"); |
|
61 |
+// LogHelper.d(TAG,"本地图片已全部上传"); |
|
62 | 62 |
return; |
63 | 63 |
} |
64 | 64 |
LogHelper.d(TAG,"即将上传的照片是"+currentPhoto); |